6227962beb4cb4058164c3935786d28d0d8c8950,collect_app/src/main/java/org/odk/collect/android/preferences/PreferencesActivity.java,PreferencesActivity,removeAllDisallowedPrefs,#,123

Before Change



    private void removeAllDisallowedPrefs() {
        // ToDo: Encode these somehow, or extract from metadata?
        removeDisallowedPrefs(R.string.autosend,
                ag(AdminKeys.KEY_AUTOSEND_WIFI),
                ag(AdminKeys.KEY_AUTOSEND_NETWORK));

        removeDisallowedPrefs(R.string.server_preferences,
                ag(AdminKeys.KEY_CHANGE_SERVER),
                ag(AdminKeys.KEY_CHANGE_PROTOCOL_SETTINGS));

        removeDisallowedPrefs(R.string.client,
                ag(AdminKeys.KEY_DEFAULT_TO_FINALIZED),
                ag(AdminKeys.KEY_DELETE_AFTER_SEND),
                ag(AdminKeys.KEY_HIGH_RESOLUTION)
        );

        removeDisallowedPrefs(R.string.client,
                ag(AdminKeys.KEY_SHOW_SPLASH_SCREEN, KEY_SHOW_SPLASH),
                ag(AdminKeys.KEY_SHOW_SPLASH_SCREEN, KEY_SPLASH_PATH));

        removeDisallowedPrefs(R.string.analytics_preferences, ag(AdminKeys.KEY_ANALYTICS));

        removeDisallowedPrefs(R.string.client, ag(AdminKeys.KEY_CHANGE_FONT_SIZE));

        removeDisallowedPrefs(R.string.client, ag(AdminKeys.KEY_CONSTRAINT_BEHAVIOR));

        removeDisallowedPrefs(R.string.map_preferences,
                ag(AdminKeys.KEY_SHOW_MAP_SDK),
                ag(AdminKeys.KEY_SHOW_MAP_BASEMAP));

        removeDisallowedPrefs(R.string.client, ag(AdminKeys.KEY_NAVIGATION));

        removeDisallowedPrefs(R.string.server_preferences,
                ag(AdminKeys.KEY_CHANGE_PASSWORD),
                ag(AdminKeys.KEY_CHANGE_USERNAME));

        removeDisallowedPrefs(R.string.server_preferences, ag(AdminKeys.KEY_CHANGE_GOOGLE_ACCOUNT));
    }

    private void initAnalyticsPref() {

After Change


                ag(AdminKeys.KEY_CHANGE_SERVER),
                ag(AdminKeys.KEY_CHANGE_PROTOCOL_SETTINGS),
                ag(AdminKeys.KEY_DEFAULT_TO_FINALIZED),
                ag(AdminKeys.KEY_DELETE_AFTER_SEND),
                ag(AdminKeys.KEY_HIGH_RESOLUTION),
                ag(AdminKeys.KEY_SHOW_SPLASH_SCREEN, KEY_SHOW_SPLASH),
                ag(AdminKeys.KEY_SHOW_SPLASH_SCREEN, KEY_SPLASH_PATH),
                ag(AdminKeys.KEY_ANALYTICS),
                ag(AdminKeys.KEY_CHANGE_FONT_SIZE),
                ag(AdminKeys.KEY_CONSTRAINT_BEHAVIOR),
                ag(AdminKeys.KEY_SHOW_MAP_SDK),
                ag(AdminKeys.KEY_SHOW_MAP_BASEMAP),
                ag(AdminKeys.KEY_NAVIGATION),
                ag(AdminKeys.KEY_CHANGE_PASSWORD),
                ag(AdminKeys.KEY_CHANGE_USERNAME),
                ag(AdminKeys.KEY_CHANGE_GOOGLE_ACCOUNT));
        preferencesRemover.removeEmptyCategories();
    }